From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 19 Jul 2011 15:45:51 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2142^2~71
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=e3b2c16d7f71f41dea8a652cd6b1b0bb0732ce2f;p=emacs.git

Merge from trunk.
---

e3b2c16d7f71f41dea8a652cd6b1b0bb0732ce2f